fix(notifications): clean up control flow and fix PR/Issue action confirmations #744
+342
−28
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sideshowbarker
changed the title
…firmations - Refactor NotificationsView key handling for clearer control flow: - Check for PR/Issue actions first, then handle navigation - Always return after updating prView/issueSidebar (fixes tab navigation) - Remove redundant MarkAsRead handler (section handles it) - Fix PR/Issue action confirmations in Notifications view: - Add promptConfirmationForNotificationPR/Issue methods - Use footer-based confirmation instead of section confirmation - Add executeNotificationAction to run tasks after confirmation - Add closeIssue/reopenIssue helper methods
sideshowbarker
force-pushed
the
dlvhdr/notifications-fixes
branch
from
9ff588b to
d8ccb5c
Compare
dlvhdr
reviewed
Jan 21, 2026
Comment on lines
+216
to
+224
| if m.pendingNotificationAction != "" { | ||
| if msg.String() == "y" || msg.String() == "Y" || msg.Type == tea.KeyEnter { | ||
| cmd = m.executeNotificationAction() | ||
| } | ||
| // Any other key cancels the confirmation | ||
| m.pendingNotificationAction = "" | ||
| m.footer.SetLeftSection("") | ||
| return m, cmd | ||
| } |
Owner
There was a problem hiding this comment.
I'm wondering, what's preventing the notificationsview from handling
confirmation the same as the other views? e.g. in https://github.com/dlvhdr/gh-dash/blob/main/internal/tui/components/prview/prview.go?plain=1#L100
| var prCmd tea.Cmd | ||
| m.prView, prCmd = m.prView.Update(msg) | ||
| m.syncSidebar() | ||
| return m, prCmd |
Owner
There was a problem hiding this comment.
You need to use use cmds = append(cmds, prCmd) instead of return m, prCmd
since the scrolling happens in the sidebar component which gets updated here. Right now scrolling in the sidebar with Ctrl+D etc doesn't work.
| } | ||
| // Sync sidebar and return issueCmd for navigation | ||
| m.syncSidebar() | ||
| return m, issueCmd |
|
|
||
| // Create a section identifier for the notification section | ||
| currSection := m.getCurrSection() | ||
| sid := tasks.SectionIdentifier{Id: 0, Type: notificationssection.SectionType} |
Owner
There was a problem hiding this comment.
I think you can use m.currSectionId
Comment on lines
+1632
to
+1661
| switch action { | ||
| case "pr_close": | ||
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | ||
| return tasks.ClosePR(m.ctx, sid, pr) | ||
| } | ||
| case "pr_reopen": | ||
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | ||
| return tasks.ReopenPR(m.ctx, sid, pr) | ||
| } | ||
| case "pr_ready": | ||
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | ||
| return tasks.PRReady(m.ctx, sid, pr) | ||
| } | ||
| case "pr_merge": | ||
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | ||
| return tasks.MergePR(m.ctx, sid, pr) | ||
| } | ||
| case "pr_update": | ||
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | ||
| return tasks.UpdatePR(m.ctx, sid, pr) | ||
| } | ||
| case "issue_close": | ||
| if issue := m.notificationView.GetSubjectIssue(); issue != nil { | ||
| return m.closeIssue(sid, issue) | ||
| } | ||
| case "issue_reopen": | ||
| if issue := m.notificationView.GetSubjectIssue(); issue != nil { | ||
| return m.reopenIssue(sid, issue) | ||
| } | ||
| } |
Owner
There was a problem hiding this comment.
Suggested change
| switch action { | |
| case "pr_close": | |
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | |
| return tasks.ClosePR(m.ctx, sid, pr) | |
| } | |
| case "pr_reopen": | |
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | |
| return tasks.ReopenPR(m.ctx, sid, pr) | |
| } | |
| case "pr_ready": | |
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | |
| return tasks.PRReady(m.ctx, sid, pr) | |
| } | |
| case "pr_merge": | |
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | |
| return tasks.MergePR(m.ctx, sid, pr) | |
| } | |
| case "pr_update": | |
| if pr := m.notificationView.GetSubjectPR(); pr != nil { | |
| return tasks.UpdatePR(m.ctx, sid, pr) | |
| } | |
| case "issue_close": | |
| if issue := m.notificationView.GetSubjectIssue(); issue != nil { | |
| return m.closeIssue(sid, issue) | |
| } | |
| case "issue_reopen": | |
| if issue := m.notificationView.GetSubjectIssue(); issue != nil { | |
| return m.reopenIssue(sid, issue) | |
| } | |
| } | |
| pr := m.notificationView.GetSubjectPR() | |
| issue := m.notificationView.GetSubjectIssue(); | |
| switch action { | |
| case "pr_close": | |
| if pr != nil { | |
| return tasks.ClosePR(m.ctx, sid, pr) | |
| } | |
| case "pr_reopen": | |
| if pr != nil { | |
| return tasks.ReopenPR(m.ctx, sid, pr) | |
| } | |
| case "pr_ready": | |
| if pr != nil { | |
| return tasks.PRReady(m.ctx, sid, pr) | |
| } | |
| case "pr_merge": | |
| if pr != nil { | |
| return tasks.MergePR(m.ctx, sid, pr) | |
| } | |
| case "pr_update": | |
| if pr != nil { | |
| return tasks.UpdatePR(m.ctx, sid, pr) | |
| } | |
| case "issue_close": | |
| if issue != nil { | |
| return m.closeIssue(sid, issue) | |
| } | |
| case "issue_reopen": | |
| if issue != nil { | |
| return m.reopenIssue(sid, issue) | |
| } | |
| } |
| } | ||
|
|
||
| // closeIssue executes the close action for an Issue using gh CLI | ||
| func (m *Model) closeIssue(sid tasks.SectionIdentifier, issue *data.IssueData) tea.Cmd { |
Owner
There was a problem hiding this comment.
| } | ||
|
|
||
| // reopenIssue executes the reopen action for an Issue using gh CLI | ||
| func (m *Model) reopenIssue(sid tasks.SectionIdentifier, issue *data.IssueData) tea.Cmd { |
Owner
There was a problem hiding this comment.
| // This is separate from section confirmation because PR/Issue actions in | ||
| // notification view need to be executed on the notification's subject PR/Issue, | ||
| // not on the notification section itself. | ||
| pendingNotificationAction string // "pr_close", "pr_merge", "issue_close", etc. |
Owner
There was a problem hiding this comment.
should this live in the notificationsview? well if we move some logic there it
makes sense
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Refactor
NotificationsViewkey handling for clearer control flow:prView/issueSidebar(fixes tab navigation)MarkAsReadhandler (section handles it)Fix PR/Issue action confirmations in Notifications view:
promptConfirmationForNotificationPR/IssuemethodsexecuteNotificationActionto run tasks after confirmationcloseIssue/reopenIssuehelper methodsHow did you test this change?
Tests included!